Continue the deprecation of GtkIconSet

Deprecate gtk_icon_set_render_icon_surface() and gtk_image_get_icon_set(),
which take parameters of the deprecated GtkIconSet.

https://bugzilla.gnome.org/show_bug.cgi?id=703616

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index c9528304e6bb18705d1904e99d984cd7d6bf1dc8..ca54ad1b240ece437f61bd2c3b1fba2933e9e54d 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1597,6 +1597,8 @@ gtk_icon_set_render_icon_pixbuf (GtkIconSet        *icon_set,
  * Return value: (transfer full): a #cairo_surface_t to be displayed
  *
  * Since: 3.10
+ *
+ * Deprecated: 3.10: Use #GtkIconTheme instead.
  */
 cairo_surface_t *
 gtk_icon_set_render_icon_surface  (GtkIconSet      *icon_set,

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index c1af7895232b45abd0454f8dbefede5c65467ddf..a159f06d683f101a4f9622a34b0955085487f367 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -601,10 +601,12 @@ ensure_surface_for_icon_set (GtkIconHelper *self,
 
   scale = get_scale_factor (self, context);
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   self->priv->rendered_surface =
     gtk_icon_set_render_icon_surface (icon_set, context, 
                                      self->priv->icon_size,
                                      scale, self->priv->window);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   if (self->priv->rendered_surface)
     get_surface_size (self, context, self->priv->rendered_surface, 

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 0fd4ce0d6c96d0d4edd9746d5e9ae2262f197d34..8b25a0698d70e8d868bfabbda964741590c910f4 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1285,6 +1285,8 @@ gtk_image_get_stock  (GtkImage        *image,
  * Gets the icon set and size being displayed by the #GtkImage.
  * The storage type of the image must be %GTK_IMAGE_EMPTY or
  * %GTK_IMAGE_ICON_SET (see gtk_image_get_storage_type()).
+ *
+ * Deprecated: 3.10: Use gtk_image_get_icon_name() instead.
  **/
 void
 gtk_image_get_icon_set  (GtkImage        *image,

diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index a7fede0a88516ae243ace2afb86bc63f42a38650..18e26e25a62c2b720e9b1af60b277f79a9b7f6fd 100644 (file)
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -182,7 +182,7 @@ GDK_DEPRECATED_IN_3_10_FOR(gtk_image_get_icon_name)
 void       gtk_image_get_stock    (GtkImage         *image,
                                    gchar           **stock_id,
                                    GtkIconSize      *size);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_10_FOR(gtk_image_get_icon_name)
 void       gtk_image_get_icon_set (GtkImage         *image,
                                    GtkIconSet      **icon_set,
                                    GtkIconSize      *size);

diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index 6b9dfd38b2646d1b032fd0518d1f49595a76fb6b..be8a0dcca48b9dd327ee838415b1f582f568f54f 100644 (file)
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -885,7 +885,7 @@ GDK_DEPRECATED_IN_3_10
 GdkPixbuf  * gtk_icon_set_render_icon_pixbuf   (GtkIconSet      *icon_set,
                                                 GtkStyleContext *context,
                                                 GtkIconSize      size);
-GDK_AVAILABLE_IN_3_10
+GDK_DEPRECATED_IN_3_10
 cairo_surface_t  *
 gtk_icon_set_render_icon_surface               (GtkIconSet      *icon_set,
                                                GtkStyleContext *context,